From: iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Date: Wed, 12 May 2004 09:12:53 +0000 (+0000)
Subject: bitkeeper revision 1.900 (40a1ea95C9xhe9YOF_J5uno7phAXWg)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~18221
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=0c0d7451988066ceea65cdd0e17070b0a476fd2a;p=xen.git

bitkeeper revision 1.900 (40a1ea95C9xhe9YOF_J5uno7phAXWg)

Merge
---

0c0d7451988066ceea65cdd0e17070b0a476fd2a
diff --cc xen/common/kernel.c
index b33524928d,6cd567d601..76747fa981
--- a/xen/common/kernel.c
+++ b/xen/common/kernel.c
@@@ -31,7 -31,7 +31,8 @@@
  #include <xen/console.h>
  #include <xen/net_headers.h>
  #include <xen/serial.h>
 +#include <xen/shadow.h>
+ #include <xen/trace.h>
  
  kmem_cache_t *task_struct_cachep;